Fix up inline with recent changes