Various fixes and additions for demo purposes