Apply fixes for teensy