Fix instalation problems