fixed minor issues for version 11

fixed minor issues for version 11