Minor enhancements
Minor fix
Minor enhancements