Added a few casts.