Builds fine and errors gone.

Still need to fix fb303 linkage snafus
0.9.1-6