Multiple small tweaks.