Typo2 and fixes