Made casts explicit