Other memory improvements in bootstrap