small fixes to some issues running demos