Fix 'edit' stream and location bug