Bug fixes as of 10/24