Fixes for manifest to match new package structure