Various Manifest Oriented bugfixes

@dmp42 @BrianBland @dmcgowan