Bumped scala lib versions.
Fixed constraint clustering.