Replicated other changes - to el-get-setup