Follow up spec fixes

Some follow up fixes as recommended by @lunks