Fix all bugs