spec deprecation fixes