fix inconsistencies from recent refactorings
after new tests