fix and dependencies