Revert "Clean some bugs"

This reverts commit 975f47f29f29c7699046b439329d102c10b19c7e.
Official release of 3.4.0 for Windows & Linux (Real)