Stabilizing code a bit