busybox: add 2 upstream fixes