Fix entrypoint specs

Also non root entrypoints cannot be round tripped in all cases. So this
spec is only a safety net.