Bug fixes for 35