Finish bug fixes after change out of data services.