more fixes for PBC