some fixes post prod