Final tweaks before merging into master