GCC correctness fixes.