Fixing the remainder of the specs