Minor fixes before marking as stable.