[20180316230415] Manifest Tweaks