Even more gate fixes....