Gate fixes