Some fixes for styles