Update code to compile with BC 4.2.1