Fix: improved compatibility with GCC (several tests still fail)