Object server: Bug fixes