WIP fixing specs for new versions of things