Some uncritical fixes