Minor improvements & Fixes