Fix type hinted  issues