initial fixes for simulation