Cleaned up the final casting issues in the client.
Merge pull request #2 from michaeljdeeb/client-cast-fixes

Cleaned up the final casting issues in the client.