Folio fixes