Add missing casts