Mezzanine style fixes

Is there any reason there's no PR for this already?