Fix errors + minor changes

My previous PR introduced errors for Litle processing