Fix deps and simulator