Misc fixes, enhancements