Fix for GCC errors and warnings.