Fixes for sizeof int