Next round of fixes (Jochen)