Update to latest version of RuboCop and fix issues