Rootfs enhancements p2