Extra root check, and compile fixes.