Fix all these things