Fixes for auto date fields and entity restoration