Bug fixes for 2.4.0