Bring in some changes from Teensy