fix deprecations; spec updates