Misc updates and enhancements