gustaf_jannerfeldt's patches