Two Bug Fixes via NG, 2014-02-11