[#102] Minor enhancements