MM: minor changes