General clean-up and making sure the specs run.