Added missing casts