Minor changes to keep Agent from running