fixes for linda support