Update to hopefully fix issues compiling under GCC