Fixes to loading of a single row