Some minor changes to the gates