[Impl] - fix types.