File bug fixes