Some small changes for making the warden more effective