Fixing warnings...