Some clean up and link fixes.