File bundle fixes