Fix type warnings from previous commit