Fixig more issues with int conversions