Corrected more issues