Float vs int bug fixes