Small fixes all around.