Fix some Manifest bugs