Fixing app org issues