Another attempt at getting the system path munging correct