Fixes for recurring invoice