Adding some minor adjustments