Spec and rubocop fixes.