4.11.7 Some little additional fixes