Fixes and preperations for agent 1.0-beta.3