Further adjustments to make audio match i9103 implementation and some other tweaks