fix some issues at api version 10