various spec fixes