Minor update for bug fixes and enhancements