Add changes lost in litcoffee conversion