[2.4] Bug fixes and improvements