Add parts upcoming bill fixes