several fixes collected