Some minor tweaks to make everything fit properly.