More bug fixes in manifester
Merged