Fix types for 64bit