Fix/sim usim problems