mount: improve object handling