Fixing some warnings.
This isn't working...