Some fixes to Shared Canvas viewer