fix broken spec and deprecations