Not sure how, but fuck, it's mergeable.

Fixes shit, without map and such.