Small bug fixes discovered in wild.