Fix version related errors