Fixing some the of the types