A bunch of micro-fixes before going 2.18 final