fixes to collocation