Minor changes to Door