[master shield fixes]