* Minor tweaks and adjustments