minor fixes to types