Miscellaneous tweaks and enhancements