Fixed some issues with firstboot