fixes from various projects
Code style (WS)