Small fix and api version recheck.