Data request fixes