More cleanup/fixing for Pawn shelter code