Several review based fixes