more changes to make the unit test happy