Backport from Marek: Allow to bootstrap with mcs
Backport from Marek: Make some code portable
Update wrong merge
Add another bootstrap workaround
Add TODO