Bootstrap upgrade fixes