Fix C++ stuff and nspire-* permissions