Fixes for when files are not yet available