Corrected errors generated from last changes.