Miscellaneous tweaks