Imoroved some version coinstraints