Adding a few casts