Fixed some residual stuff after rebase