Cleanup: fixed some warnings.