Fix various bootstrap issues.