more fixes to allow spacey paths