Realign diagram and fix ocl constraints.