Fixes to file serving