GH99 - Fixed compilation errors, effects on diagrams and cleaned up some
code