Fix/sim usim problems

:100: