Two fixes for bugs found in the v1.2 QA cycle