Fixed bugs detected