Version 2.4 - a few minor fixes