Changes to support viewstart compilation
Fixes #974