Minor rubocop fixes using 0.18 release