fixed some errors with extension/app conflicts