File element fixes