Fix paths and dependencies