fix build and runtime dependencies
fix/hack to allow building