Yet more tunnel fixes