Handle some more spec violations