Make sure changes are consistant with existing code