Fixing warnings from -Wall