Fixed references for demo