Rectified certain errors