Fix for coding rules violations