Copied over fixes from saints app.