Fixed BC bug and others.
Rest of BC fix.