Data requests fixes