WIP Spec fixes