Minor enhancements #320