Fix specs

Contains a couple of housecleaning commits as well.