Some final updates before the merge to master