fixes to complete the BFS build