Bump fixes for 3.11.5