Corrected some inconsistencies