diff --git a/fs/entry.go b/fs/entry.go
index 54bdfae05..d4e1b6adc 100644
--- a/fs/entry.go
+++ b/fs/entry.go
@@ -64,7 +64,7 @@ func (p *Permissions) UnmarshalJSON(b []byte) error {
 // EntryMetadata stores attributes of a single entry in a directory.
 type EntryMetadata struct {
 	Name            string           `json:"name,omitempty"`
-	Type            EntryType        `json:"type"`
+	Type            EntryType        `json:"type,omitempty"`
 	Permissions     Permissions      `json:"mode,omitempty"`
 	FileSize        int64            `json:"size,omitempty"`
 	ModTime         time.Time        `json:"mtime,omitempty"`
diff --git a/fs/upload.go b/fs/upload.go
index f34dfd257..bcabb07b4 100644
--- a/fs/upload.go
+++ b/fs/upload.go
@@ -341,6 +341,10 @@ type uploadBundle struct {
 func (b *uploadBundle) append(e File) {
 	b.files = append(b.files, e)
 	b.metadata.FileSize += e.Metadata().FileSize
+	emt := e.Metadata().ModTime
+	if b.metadata.ModTime.IsZero() || b.metadata.ModTime.Before(emt) {
+		b.metadata.ModTime = emt
+	}
 }
 
 type uploadedBundleFile struct {
@@ -403,7 +407,7 @@ func getBundleNumber(md *EntryMetadata) int {
 	// TODO(jkowalski): This is not ready yet, uncomment when ready.
 
 	// if md.FileMode().IsRegular() && md.FileSize < maxBundleFileSize {
-	// 	return md.ModTime().Year()*100 + int(md.ModTime().Month())
+	// 	return md.ModTime.Year()*100 + int(md.ModTime.Month())
 	// }
 
 	return 0