SOME fixes based on rubocop output.