More enhancements to misc