Fix passing c++ libs to linker; fix bootstrap code