Small fixes (Next plan - add MongoDB support)