added fixes to types