next: sync a few fixes

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>