Remaining 3.5.3 bug fixes. See readme for details.