Fixes for broken files