Misc tweaks, moved event handler registration to client proxy