Bug fixes for October 25th