misc fixes

Douglas Raillard requested to merge github/fork/douglas-raillard-arm/lisa-next into next Nov 27, 2018