Fixed bugs having to do with conversion