First fixes for linda