More boot improvments