Minor enhancements fitting closed-source application's needs.