Fixed several error