Updated important fixes for 1.12.8dev