fixes to definitions