Minor spec improvements