Several fixes and enhancements