Tiny spec improvements