Few small fixes for rootfs build failures