staging area layout fixes