Branch fixes.
Hacks to correct linking.