Made some fixes so that the spring service works.