Various API changes/fixes.