Some changes/tweaks