fixed more incompatabilities