Less fixes

Less fixes