Update 2.4

Small changes