Feature/spec fixes

WIP