Tieske several fixes