Small fixes for 4.40