Tweaked proxy population and events for triggering the system proxy closes #510