VG-1614: Bug fixes for CAD and Feature datasets

Wasn't zipping things correctly. Was a bug with CAD annotation to
handle.