fixes as per bug 14659 and others
more bug updated