Latest bootstrap fixes