Committed changes as per Remseth's comments in https://github.com/Cloudname/copkg/pull/6