Merge "Fix API errors"