Simplified the BC implementations
Trying to make the package build again on 12.04