Fixes for astyle