Miscellaneous tweaks.