minor changes for compatibility with CheetahDesign