Fixes conversion errors