Fixed more warnings.