Actually fixed doors.
Merge origin/master