Fix latest update spec issues (2013-10)