Firstboot enhancements