Various fixes/enhancements