Minor fixes for file_status