Add a couple of extra casts to avoid extra #include