FIX: Revert a couple app changes