Updated for Issues in 1.2 milestone

Issues identified in the 1.2 milestone are incorporated into this
commit.