Work around porting bugs reported by Dieter in