Add weaver back to installation
Changes to compile with globus 5.2