Fixed a few more branches. See Comments.