fix dependency issues, fix according to comments in 69e2558ea9bae4c69f08cef8a3cedfcab0606b4e