Some fixes so both apps run the same way