Minor fixes for branch.