More spec fixes for build