Bug 930731: minor fixes to make toplevel::server work on ubuntu