Spec fixes

Fixing master branch