Make some minor changes to What/How