[LMAG] Lint fixes