Checks and build sanity

Resolve false errors during execution. Ensure that demo runs