Onboard Files fixes