Few changes/tweaks