some fixes collected