Minor bugs fixed - dhishna