fix dependencies and build both versions