Fixes for code quality violations