Some minor tweaks that form the basis of bigger ones.