Missed some fixes as part of resolving the committed merge conflicts.