fix buildstrap & configure