gatekeepers and other fixes