Fixes manifest scoping issues, fixes github issue #11