Intermediate Commit

Fixed compilation errors in bourbon among other changes.