Fixed bootstrap problems discovered on a fresh rebuild.
Merge pull request #3 from pbugni/master

Bootstrap problem fixes.