Fixes after the merge of 2.0 into this branch