fixes for Murali (10/10/2013)