Removing leftovers from rebasing
Fixing a few more issues after big rebase