Syncing inconsistencies

Encountered some inconsistencies, then fixed.