Replace int with bool in some files. #654