New Bug fixes as 10/23