Some codenarc fixes