Fix issues with mixed default/non-default context