Fixed a bunch of Int values that might be a problem on mac