Changes recommended by SiLabs

Some changes to fix UV issue.