Minor adjusts for improve instalation process