Add fixes for 96+