Merge pull request #1452 from glneo/fixups-for-k3

Couple of fixups for K3 platform