Add more deps, comment out PE mods