Final fix to bootstrap