fix issues after upgrading to latest PBJELLY