mk: Address review feedback