fixes for expected %s at ...