Fixes for coding rules violations