Minor changes to om.cpp for testing.