Update to fit latest canadensys-view-includes