Even more fixes for clarity