Fix specs and clean up a bit