Fixes without rubocop