rtfd build fixes