Small improvements
v2.4.2 release