Fixes for certain files