Bug fixes: bootstrap