Fix some inconsistencies