More improvements based on Canvas Interoperabity testing