Fix all current issues