A few more small fixes/enhancements