Fix/sim usim problems

Yep, done.