Fixes on installation