Fix Spec and Lint because @rjw1