Fixes, inconsistencies