fix various dictionary/app-id problems