Bug fixes for 10650