Correction of various type error