Compatibility fixes for older GCCs (nw)