Fixes for style