Various tweaks to make life easier.