manifest check and other fixes