Minor updates to move render containers/pinning along