Fixes that was missed first time around.