Corrected some cadence issues