Re-synchronize to original TAJO - fixed compilation errors