fixing few incompatabilities