More R#'er automated changes