Misc enhancements