Updates for less compiler