Fixes for issues encountered during demos