Attempted fix for several GCC warnings.