Working on bug fixes for rootfs