More mongo fixes