Total specs fixes