Fixes for consistency