Some bugs with isolated files