Corrected some constructs