Add a few missing casts