Fix Collocation bugs