changes to make spec2 compilable