Fixes after upstream 1.0 merge.