Data Source fixes, new error explanation messages