Fixes for clarity