Fix all teh things