Fix some small inconsistencies