replacer support for no auto and minor code fixes