model spec fixes