Fix invalid sources message
Reset lesser version segments
Move away from plus notation
Use generics for JoinList to be more flexible