Some Issues Fixed