Partial add mas fixes