Fix andrews comments