Re-add in some patches Brenden made