Add fixes from upstream magma

Signed-off-by: Alec Ari <neotheuser@ymail.com>
Modify date

Signed-off-by: Alec Ari <neotheuser@ymail.com>