Fixing sample/filename issues.