RIP Toolserver. (Some fixes for Labs compatibilty.)