Fixed various probs with multiple systems in one directory