some fixes (Bastian)