Fixed demo issues

Fixed up demo to use proper 'match' signature