Fix warnings in Simplify