Cleaned up a few more conversion warnings.