Fixing some problems with p2-admin's version.