WIP more spec fixes