Small cleanups + MT05459 (nw)