Fixed some version issues