fusion3: Misc fixes/updates

Change-Id: I9edc7fd2da5443d557c9611460e893c44d221f65