Fix for some codenarc compilation errors.