Fixes, file support