Fix canvas refresh bug and double plugin load post merge