Filename extension fixes