Fixed type warnings