More fixes, more spec [ci skip]