Fixed internal path handling