More working around gcc deficits