Fixing things all around.