Fixed more bad path escapes