some more minor fix