Fix some problems with manifest file