fixes for codenarc