mariusl - some tweaks for bootstrap (old version configured originally)