Added a bit more flexibility in supervisor path handling