Fix all that up