Some small fixes/changes for #get_file_data addition

Change-Id: I3a6e92b56782412d7d0d6e66bc63f31de588f702