Several small improvements addressing review comments by Stefan
Several small improvements addressing review comments by Stefan

olifre/root,root-mirror/root,root-mirror/root,olifre/root,root-mirror/root,root-mirror/root,root-mirror/root,olifre/root,root-mirror/root,olifre/root,olifre/root,root-mirror/root,olifre/root,root-mirror/root,root-mirror/root,olifre/root,root-mirror/root,root-mirror/root,olifre/root,olifre/root,olifre/root,olifre/root