Some minor tweaking