Last fixes for demo