Fix all-in bugs