Various tweaks and enhancements