Include jakimfetts' changes to my fork