Some cleanup and style fixes for fixlimits