Fixes for the SimPy layer.