Fixes for data retrieval