Fixed version constraint issues