Diagram: Several bugfixes
Diagram: Several bugfixes

One of these reduces the flickering on Mac OS X Yosemite

mbeddr/mbeddr.core,mbeddr/mbeddr.core,mbeddr/mbeddr.core,mbeddr/mbeddr.core,mbeddr/mbeddr.core