Fix manifest
Fixed bugs