Fixing subtree standalone build and fixing a few crashing issues.