sim: minor improvements