Fixes and other enhancements