fixes for Nata's demo