no-pot option, fix issues