More small bugfixes

Another decoupling crash + sandbox mode works again