Bug fixes for 201352