More miscellaneous tweaks