Fix from merges

A few issues arose from the merge, such as method renaming or changes
to the shared DOM.