Included fixes for these 6 files