re-enable and fix some stuff with agent installation