Issues Fixed