Fixing build errors that crop up during Archive