Trivial changes to better sync with viewer 3