Fix additional warnings.