Minor fixes enhancements