Credit days and payment tool fixes