udpates for canary 0.3.5