Fixing more broken paths