Fixed some issues brought on by rebasing