Fixing the warnings.