Code Bug fixes

Krishna Manjunath Venkatasubramanian