Rebased master and fixed breakages