Fixed version checks and updated