Adds a couple more specs (dspence, please CR)