Uncritical fixes