[SERVDEV-49] - Added some fixes and cleanups