fix-types

[Implementation] Fix type errors