More fixes to objectcontexts