Avoided some pedantic GCC warnings.