First set of fixes for door