Fix app derps and add more logging