Require cleanup
Fix clicking edit after first create not having fields set