fixes for consistency