Fixes for simu