Add a few missing bits that are needed until full OmniPresence support is committed.