A few small fixes/enhancements