Solved compilation errors for UnMA integration