fixes to type