various spec clean-ups