fixed some more explicit types in core