Fix old specs.  Need to finish implementing new way of handling shipments.