Fix doors and some null references