Fixed mongo and controller fixes too