Bug fixes as on 11/30