Some E_STRICT fixes and a fix to extended content saving.