Various fixes for standard styles