Minor fixes/enhancements