Mostly fixes collision detection, on linux, at least