Add u8825 and fixes