Fix inconsistencies in previous commit