Adding missing methods

I forgot to cherry-pick these methods.