PMO-2462/PMO-2238: fixing Podra model issues