Improving non-topological gates