Fixed some more warnings.