Fixes for filename cases