Minor fixes all around.