Fixed two bugs

See commit tagged with v1.2.1 on branch post-compo; second two items are
what were fixed