Fixes and enhancements here and there