Few more double-door bugfixes