Fixes : Minor bugs and issue fixes.