Cleanup compiler warnings.
Update to what I actually use.