Fix bootstrap issues

Signed-off-by: José Valim <jose.valim@plataformatec.com.br>