Fixes in 'spec' namespace.