Fixed unstaged stuff