Update rubocop config and do new fixes