Fixed small issues
Final 4.0.1 commit