Fixed type mis-matches