Fixed even more warnings.