Minor bugfixes to the replies