Type fix and more extensive busybox