fixes found after making simpledemo2.0