Fixed dependency issues introduced by BCEL removal