Make default path safer