Cleaning up some spec-related problems