Fixes to satiate rubocop