GCC error/warning fixes