Some changes to be compatible with rust master
 - Either was removed from master, so here too
 - #[start] was removed from the demo