Fix some type