More miscellaneous plex specific additions