Fixed missing things from rebase