Corrected more problems