fix a few inconsistencies