github misc pb fixes