Few Issues Fixed