Fix wrong data types