More spec fixes and added missing relations