Fix for multiple warnings.