Another fix for the bootstrap and bootstrap generator.

Signed-off-by: Frank Mertens <frank@cyblogic.de>