more fixes to collocation