Two fixes to speed up (a little bit) installation process