Fixes for style check