fix rcirc due to upstream changes
buncha stuff