Fixing gcc complaints