Fixes the bootstrap hacks and adds a locale definition.