Fixes for updated understanding of appTypeIds