Fix for symlinked data and pid directories