ICanvasContext and ILayer fix for Fedor