bugfixing our way towards linux support