Fix custom prefix/suffix option bugs