Small fixes from moving Canvas into Core