Improved app manifest fix