Last second 1.21.13 patch fixes