Various Bug Fixes via NG, 2014-01-29