More Pregel fixes