Fixes for coding style