Fix almost all weirdness