Some small changes regarding target API