Fix Rest Service Issues