- Bug fixes
- Cleanups

Signed-off-by: Jithin Jose <jithin.jose@intel.com>