Fixes to pass Rubocop