Fix some doors
Merge remote-tracking branch 'scrawl/doors'