Some API fixes + more plt switch