Last fixes for 1.14.1