updates for R3 packaging improvements