api fixes on spec, source