Fixes for mongoDB and newer express version