Fixes and enhancements