More small fixes/enhancements