More improvements suggested by Matt