Small fixes for consistency