Specs fixes