Some tweaks to accomodate long running server (lives for 48 hrs after last access)