Fix bugs on several pushes