Merged / fixed errors.