Fig overflowing code for onServer.
Fix up references.