Fix API changes; lines > 100 chars.