Fix for BC problem and others.