Small fixes for 1.4