Fix minor type warnings