more version issue fixes