Bug fixes and enhancements
