Working on bugs/enhancements for 2.4.3