Additional enhancements and fixes