Coding rule violations fixed.