Fixes to increase consistency