Fix tiny inconsistencies