There are bugzilla bugs for these features, and I'm adding them as blockers instead of TODO notes, it shouldn't require any change in the code here.