Fix more bugs to pass Busybox tests