more fixes for wrong references...