Fix some wrong data-types