hot bugfixes and small context_instance handling issues