Fixes for FileField