Style repairs, etc.